Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Tue, 28 Mar 2023 01:41:22 +0000 (09:41 +0800)

committer Po Lu <luangruo@yahoo.com>

Tue, 28 Mar 2023 01:41:22 +0000 (09:41 +0800)
author Po Lu <luangruo@yahoo.com>
Tue, 28 Mar 2023 01:41:22 +0000 (09:41 +0800)
committer Po Lu <luangruo@yahoo.com>
Tue, 28 Mar 2023 01:41:22 +0000 (09:41 +0800)
diff --cc configure.ac
Simple merge
diff --cc etc/PROBLEMS
Simple merge
diff --cc lisp/net/eww.el
Simple merge
diff --cc lisp/subr.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Tue, 28 Mar 2023 01:41:22 +0000 (09:41 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Tue, 28 Mar 2023 01:41:22 +0000 (09:41 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
etc/PROBLEMS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/eww.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history